From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 25 Aug 2009 13:58:07 +0000 (+0100)
Subject: xen/xsm/flask:  Fix Flask MLS context generation
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13422
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=1e52826824aa236e1fb27e9aa21c72432dbf399a;p=xen.git

xen/xsm/flask:  Fix Flask MLS context generation

Signed-off-by:  Stephen D. Smalley <sds@tycho.nsa.gov>
---

diff --git a/xen/xsm/flask/ss/mls.c b/xen/xsm/flask/ss/mls.c
index aee9fc312a..bbe7a49a61 100644
--- a/xen/xsm/flask/ss/mls.c
+++ b/xen/xsm/flask/ss/mls.c
@@ -105,7 +105,7 @@ void mls_sid_to_context(struct context *context, char **scontext)
     {
         memcpy(scontextp,
                 policydb.p_sens_val_to_name[context->range.level[l].sens - 1],
-                strlen(policydb.p_sens_val_to_name[context->range.level[l].sens - 1]));
+                strlen(policydb.p_sens_val_to_name[context->range.level[l].sens - 1])+1);
         scontextp += strlen(scontextp);
 
         /* categories */
@@ -124,7 +124,7 @@ void mls_sid_to_context(struct context *context, char **scontext)
                     else
                         *scontextp++ = ',';
                     nm = policydb.p_cat_val_to_name[prev];
-                    memcpy(scontextp, nm, strlen(nm));
+                    memcpy(scontextp, nm, strlen(nm)+1);
                     scontextp += strlen(nm);
                 }
                 if ( prev < 0 )
@@ -132,7 +132,7 @@ void mls_sid_to_context(struct context *context, char **scontext)
                 else
                     *scontextp++ = ',';
                 nm = policydb.p_cat_val_to_name[i];
-                memcpy(scontextp, nm, strlen(nm));
+                memcpy(scontextp, nm, strlen(nm)+1);
                 scontextp += strlen(nm);
                 head = i;
             }
@@ -146,7 +146,7 @@ void mls_sid_to_context(struct context *context, char **scontext)
             else
                 *scontextp++ = ',';
             nm = policydb.p_cat_val_to_name[prev];
-            memcpy(scontextp, nm, strlen(nm));
+            memcpy(scontextp, nm, strlen(nm)+1);
             scontextp += strlen(nm);
         }